Analysis tools fixes