Few fixes (Everything should work now)