wip
Merge branch 'master' into wip
Fixes against errors/warnings in vint
Fixes tests