Final fixes I hope