Fixes up stuff