Update to master and fix warnings