Couple fixes and processing &mdash;