Fixing Moz warnings