-fixes due to latest update