Fixed more compatibility issues between master and hashChain code