Fixing more PHP Doc related issues.