Fixes for potentially uncommitted changes?