Fix issues with vanilla Jungle