Two small fixes for my latest commit