A couple plotting bugs cleaned up