Fixes

Fixed some stuff