Clean up fs location resolution
0.0.5