Fixes for Aeron's commits. Visual improvements.