fixes to commotion_helpers