Fixes for change in instantiate signature