Got to fixing final issues