Some other small fixes