Fixing shit that was broken