Reduction of warnings