minor fixes to multilayer handling hack - refs #2210