Fixed dependencies to work with 0.8