various cleanups
Merge https://github.com/harbour/core