Some more runtime error fixings.