Final fixes... hopefully :))