Minor incomplete fixes