Merged small style changes
Merged small fixes from upstream