Fixes

Fixed
Fixes 2