Fix changes due to lates merge