Update - Minimal fixes