Made plugin and demo compile with Coq 8.4pl3