[SP] Fixed compilation issues caused by merging from JK2:HD