Fixed some issues related with latest changes detected by the tests