Fixes to stuff! stuff stuff stuff