Fixed up Barracks madness