Fixes following testing
Fixes after testing