addl changes to get dynamo to fully compile on 15.0