Fixing some Mattock::Task related bugs