Fixes from local testing