Fix object references
Small plot fixes