Fixed some issues for re-testing