Fixes to stuff