[3.8] mutliple fixes