some cvl module specific changes were necessary