Fix suggestions from @drtshock