Fixes to order of calls