Fix some usability issues