Massive pile of pedantic fixes