More modifications as I move things around on my Mac