- up to 2.6+git fixes