fixing two issues Max found
Merge pull request #569 from einhverfr/1.4

fixing two issues Max found