Minor bug fixes
Re-enables module integrity checks