* Final fixes