Fixed minor bugs in contextual changes after dot