Fixes

Fixed some errors