Final commit (few fixes)