Bunch o fixes
Merge branch 'master' into ambrosia