Splice fixes for OS X