Just fixes

Just fixes