Fixed issues with previous commit. Refs #210.