fixes to latest update