Fixes suggested by Evrin Smith https://groups.google.com/d/msg/pellet-users/fNF8KdB-rvM/BSgvL9YfjGIJ