Few small fixes before adding testing pipeline