fixes to latest