Fixes for Ireland deployment