Bugfixes last changes