RPG: Some fixes