Fixed class loader issues.