Build 7: various fixes