Refs #6248 - HHVM compatibility

Just fixing few issues from Scrutinizer.