Core review fixes