Fix more compiler errors; remove splassert()