Fixes to get elFinder working again [#1113]