Fixed some CR's

Fixed some CR's