Refs #1. Fixes to get things running again.