- some code hinting related fixes