Added lots of checks to *finished in kernel