Directions bugfixes