Fixing some dumb mistakes