Implementation fixes. #390