Use of new APIs (19) and tweaks