pull requet fixes