GUI: prepare for API changes