Small adaptions for deploy to int