FIX: OS X bundling and a warning