Fixes for issues noted during training