Fixed lastest errors after fresh install