Setup to work with new env
Eliminate compiler warnings