Fix dependencies and run attributes