Fix dependencies and bootstrap classes