Few bug fixes for prospective analysis