Fixed remaining points in issue #2