analysis fixes