Fixed runtime problems.