Merge: Nitrpg: minor fixes