more exceeded check fixes