Minor fixes for --install etc