[PAXWEB-493] - Initial removal of 400-500 warnings