Dependencies fixes