Update to tip of master and other minor fixes