Quick small fixes