Fix path
Cleanups