Dar 592

Fixes for:

https://wikia-inc.atlassian.net/browse/DAR-2377
https://wikia-inc.atlassian.net/browse/DAR-2387