Some minor improvements, fixes and changes.