More entry fixes.