Fixes

Fixed some issues here and there