More runtime safeties