Bastion Factory Update; Attempting to get rid of the errors.

Attempting to remove all remaining errors that are delaying the Bastion update for the CivTest, and eventually CivCraft, server.