Fixed some merge issues. Updated paths in LIST.E16