Few fixes before hackagr release