workplan fixes