Common oditiy enhancements

handle often seen oddities better