Draft: minor fixes