Fixes as per xml validation