0.3.1 small fixes