Fixing some silly mistakes