fixed some dangling commotion helpers calls