Adding first and last, fixing build