PR #4 Fixes