Final PATH fixes for the night