Random small fixes