Added fixes for other PR methods