Forgot to commit my last few config dialog fixes, apparently. Oops.