Fix some a path issue