perf and dep fixes