Minior updates

Minior updates