Fix All bugs