Fixed some PHPDoc annotation issues flagged up by scrutinizer