some minor fix , which were causing touble