Fixes and cleanup. DT's ModView fixes, too.