Implemented fixes detailed in issue #2