HORNETQ-1430 plus a few other small fixes