Continious integration additions and fixes