Changes & fixes from Jessica meeting