Fixes after the merge feb505f

refs #1115