Removed a couple dozen warnings