Took care of these two items