Fixed up maven dependency scopes