OSX branch fixes + APROP_Friendly monster count fixes