Fixed issues with collating graphics