Proposed fixes for issues 2 and 3