Fixed exports