Really fix notice
fix integration tests
Fix regression picked up by screenshot tests