refs #2174 some bugfixes