Update Runtime checks for fixing github issue 20 and 23