Fixes, a bunch of fixes