Fix potential problems; Add custom renda support