CI changes

Adjusting code to CI