Fixed runtime errors, for real this time