Minor cleanup of compiler and debug warnings