Sample framework fixes

Fixes some small issues with the framework.