Fix dependencies
Configuration may not be final
Revert finals