Additional changes after mergeing master and review feedback