Basic fixes (without code modification)