v1.8.1:
Still more fixes