Bring in geiser
Fix OS X