Fixed issues for 1st round testing