Common v 1.9.3 : fixes & better comments