some small fixes to make goQM work