Fixing dumb bugs