Some fixed / additions