Fix undefined vars

Refs #15