Import some fixes to x11-fm/nautilus3 from MC