Fix minor bugs reported by QA team