Fixed links and production/development stuff