Minor fixes water & makefile