Take care of warnings