Final set of changes for fix