Fixing some nitpicks