Fixes for MediaScanner