Small tweaks in preparation for static mechanic.