Fixes and more fixes

Nothing happened