small fixes for OS X

T/O