Merge from xycaleth/openjk fix-warnings