- Small tweaks.
- Make snapshot compile.