Replace couple of remaning JRequest calls