Some fixes, no more ray pb