Fix crop mark issues and other updates