More reference check fixes.