Several operational improvements