Fixed autobuy, and other changes