Fixes for code inspection tests
Nightly image optimization