Cleaned up warnings that were treated as errors; removed -O until I can solve why it's busted