Fixed dep issues