Dev master update

Changes needed for merge to compile.