Additional attempts at reducing warnings without major refactors