Last minute fixes from ag