Addressed issues raised by automated tests