Helper and few more fixe