Minor fixes and changes for Battle Institute