JGL quick fixes to get a demo for Wendy to test with