refs #631, refs #632, compilation fixes from merge