Bug fixes, bringing training buildings into line.