More bounty tweaks