Fixes for Jenkins failures