Some fixes made after running tests