more detailed analyzer fixes