Updated to next version #. Cleaned up some build warnings