Minor changes for Fortress