Fix my bugs