Fixes

and other shizzle