Sorry to tell you but if the fire inspector says change. Then you change the locks. Go to a reliable locksmith and they can put in replacement locks that are also very safe for the residents. I would contact NSW Fire Brigade and they are more than willing to tell you what locks you should have.