Fix build faults