Added more fixes for Brazilian configuration