Cleaned up compiler complaints hopefully