Some fixes for scatter plot