Fixed, most warnings gone too.
n/a