All fixes completed