Final fix up