more core fixes