couple of nanny related small fixes