remedy some scrutinzer issues