One more try at fixing all the issues reported in