Minor fixes to framework