Various fixes/changes