Fix for new CASC features, fixes Java builds.