All fixes covered