Quick fixes to minor inconsistencies