Small Tweaks #3

Small Tweaks #3 for the firse full compile on OSX.