Fixes from some tests