Remove causes of warning