fixes for macosx, bug 879799