Update fixes for annotations and various list pretty printing