Try to improve resolving some mate positions

(Would like to test this in bugfix mode)