Minor c cleanups; got rid of warnings