More gcc compatibility changes