Bug fixes

Signed-off-by: Gaurav Munjal <Gaurav0@aol.com>
Previews fixes

Signed-off-by: Gaurav Munjal <Gaurav0@aol.com>