Two more slight fixes to prevent vote starts during a vote and from nominating an empty map.