Minor fixes.
Merge branch 'release/neptus-3.0.x' into develop