Applied the fixes from d95d9a4 to JKA SP as well.