Small bugfixes on horizon