Minor improvements in InnerCore