Mixed fixes
Correcting bad programmer mistakes