Moving upwards some deprecated calls.
Some minor PHPDoc fixes
Tiny class name qualification fixes.
Merge pull request #983 from petsagouris/small-fixes

Small fixes