Fixes up some things