Fixes and more farts