Fixes from Tim