mosquito: minor bug fixing and cleanup.
Authored by: lbrenta 2018-10-06
Parent: [r3583]
Child: [r3585]
