[OSX] [IM] Resolving compile errors, nearly there...