Minor fixes from newer commits