Minor fixes, upgrade to latest