some 201404 fixes
version