Some fixes, don't remember which one :)
Merging changes from the head revision
Fixing merge problems