Eliminated trivial warnings