Fixes

Fixed some things