Pretend mode: small fixes rt 2587

https://ripplelabs.atlassian.net/browse/RT-2587