Fix various issues (integrity check complete)