Waivers and more fixes