fixed a couple of small bugs (v2.53)