Updates and fixes from test runs