random small fixes