Fixing unstable builds