Flintlock fixes.