Fixes

Fixes done