Fixes for changes to caller