Wayfinder - Small fixes