Fixes

Patch 1