Some more misc fixes and tweaks.
Some more misc fixes and tweaks.

As of this commit, the test database successfully completed it's upload
and update.

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