-tiny fixes
(Batch didnt properly resolve dependencies and used old versions of stuff...)