Buildings fixes of Athoen