Fix some selector, directive, and base-object template bits