Some alias improvements
Some OS X improvements