#3 PR Fixes