Fix issues found by 'make check' in ESource
Fix issues found by 'make check' in ESource

matzipan/evolution-data-server,tintou/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server,tintou/evolution-data-server,matzipan/evolution-data-server,matzipan/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server