Fixes for continous delivery