bug fixes on poma-6451