#136 small fixes