Minor safety improvements.