Fixed small bugs in these modules which were never added to the SVN repo