Fixes for banjo defect (DSC-337) - Unfinished