Fixes sqlmapproject#4322

Fixes sqlmapproject#4292

Minor patch

Fixes sqlmapproject#4220

Update related to the sqlmapproject#4182

Couple of trivial refactorings

Minor update

Update regarding sqlmapproject#4099

Copyright year bump

Fixes sqlmapproject#4024