Changes required by nme 3.5.4, docs update