minor fixes [merge]