Some ore zprezto tweaks