Bug fixes (added dependencies)