Bug Fixes in Unit5.pm and Unit6.pm