Merge pull request #415 from ImperatorPrime/master

Fix JK2 build and runtime breaks.