Final fixes in bubble chart for now