First Commit Fixes