Magic player bugs fixes