Fix optional mount paths