Further reduce warnings