Additional NUC compiler fixes