Fix some filesystem issues