Important compatibility changes + one bug fix