Fixed two generally annoying installer quirks.