Fixed minor issues

Fixed minor issues