Fixes to completion plotting