Fixes from first manual runs