Final fix ups