Some bugs in cross fixed - remedy is close