Folding in fixes from work
fixing regex in remote pattern