Fixed some scatter issues