Country bugs fixed