Bug fixes

lol coffeeflux