Additional fixes for pretty

pretty(everything)