Fixing classloader issues on various containers