Additional changes addressed in #331