Somewhat small fixes