Better management of multiple models on OSX. Fixes #18