NScrypt and Version System fixes