Various minor changes to stop any warnings reported by Unity/VisualStudio