Small fixes. Thanks to @Dorimanx