Feature improving backward compatibility

Fixing some errors and conflicts to be able to merge #553.