A few small fixes based on testing