Fixing build problems caused by incomplete merge of guard branch