Fixes

Fixed various things