Completed minor updates