Eliminate compiler warnings
clean up build rules