Making fixes according to comments in #123.