Minor improvements
merged in uptream