Unbreaking some JA stuff real quick.