Fixed issues addressed in #331.