FIX: Possible bugs revealed by code analysis.