ZVISION: Resolve some TODOs