Some type fixes.
Use simple char arrays for selectors.