Fixes issues.  Tests passing