FIX: Added semicolons to macros with items
FIX: Removed use reference to deprecated libs, task and rustrt