fixes for various and sundry warnings