Misc changes during last years