small fixes on core