Small fixes from workshop