Fix hardcoded dependencies