Changes for better OS X framework compatibility.