Bugfixes for Perl 5.18.2 and libmediascan
Cleanup