Fixed some minor module ssues