Various small fixes found during test runs.
Various small fixes found during test runs.

bgyori/indra,sorgerlab/belpy,pvtodorov/indra,johnbachman/indra,johnbachman/indra,sorgerlab/indra,bgyori/indra,pvtodorov/indra,johnbachman/belpy,sorgerlab/indra,johnbachman/belpy,johnbachman/indra,pvtodorov/indra,sorgerlab/belpy,sorgerlab/belpy,bgyori/indra,sorgerlab/indra,johnbachman/belpy,pvtodorov/indra