Fixes for CI failures