Attempted more checkmate fixes