Bug fixes for plotting goals