A few minor fixes based on Mac testing