Took care of "unchecked" warnings