Fixes and crap