minor wrapping and warning fixes