Fixing Minor but Annoying Bugs