#3 small fixes