Fixes

Fixing some errors