Fixed issues

Fixed issues