v0.39: minor bug fixings
v0.39: minor bug fixings

VikingDen/jira,kinow/jira,dbaxa/jira,pycontribs/jira,pycontribs/jira,rayyen/jira,m42e/jira,rayyen/jira,akosiaris/jira,coddingtonbear/jira,milo-minderbinder/jira,akosiaris/jira,milo-minderbinder/jira,kinow/jira,awurster/jira,awurster/jira,stevencarey/jira,dbaxa/jira,stevencarey/jira,VikingDen/jira,coddingtonbear/jira,m42e/jira,dwmarshall/pycontribs-jira,dwmarshall/pycontribs-jira