mash up minor fixes