Fixes for latest build