ADEN-422 Darwin fluid skin fixes to ads

Don't merge until you're Bogna.