Some minor fix for 1.5