Fixed 'make check' bugs
4 files changed