Minor misc changes