Fixes from testing