Minimal fixes