Eliminate compilation warnings, ready to submit