Fix failing specs. Refs #1323.