Minor improvements to entry-info API