Small changes

Nothing new
Small changes
Compatibility fixed