Fixes for Skopje and Ohrid