Tiny tweaks to make gcc compile this again