Fixes (minor)