common module bug fixes