Some fixes on projection