execute_assert and fixes