#4 small fixes