Some fixes from more realistic use