Fixes to no-framework branch