Minor edits for OSX compilation.