tweaks for modern (1.6) foreman