Fixes for . relative pathing