Fixes for plotting edge cases