merge local fixes for use in requirements.txt