Fix build for compiler updates