Few fixes and todos