Bunch of fixes to minimize project size **ROLL BACK THIS IF EVERYTHING DIES**