Minor fixes -- eliminating make errors on Linux