Fixes that fix things that needed fixing