WIP: ngControl fixes