Various fixes after testing with water