some random small fixes