[*] Fix issues, minor improvements