changes to make code work with latest CM/SM