Fixes from Tim Cole, Paolo