Minor compiler fixes