Fix some minor usability issues