Fixed some imports & deps.