Updated OS X and FreeBSD