Fixed exports to work on server