A few fixes for Minimal