Improved child safety mechanisms