Misc updates from mac