Minor fixes (no more warnings)