Fix some build warnings...there are many to go