minor fixes for control chain