More neoscrypt changes