Fixed issues after third review