Make Ubuntu build instructions more robust