various fixes in jsps for automated testing