[#109] PR review fixes.