Final Commit minor fixes