Resolve some compiler warnings so that I can build under dev mode