Some fixes for 193 foreman