Build fix/nit