[WIP] Increase stability in dependencies

DO NOT MERGE!