Two small bug fixes and a new feature (branch details)

Should hopefully be uncontroversial!